github desktop merge conflicts